Auto merge of #3979 - hjr3:issue-3911, r=alexcrichton

author bors <bors@rust-lang.org>

Tue, 16 May 2017 22:16:09 +0000 (22:16 +0000)

committer bors <bors@rust-lang.org>

Tue, 16 May 2017 22:16:09 +0000 (22:16 +0000)
author bors <bors@rust-lang.org>
Tue, 16 May 2017 22:16:09 +0000 (22:16 +0000)
committer bors <bors@rust-lang.org>
Tue, 16 May 2017 22:16:09 +0000 (22:16 +0000)
diff --cc src/cargo/util/errors.rs
Simple merge
diff --cc src/doc/manifest.md
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 16 May 2017 22:16:09 +0000 (22:16 +0000)
committer	bors <bors@rust-lang.org>
	Tue, 16 May 2017 22:16:09 +0000 (22:16 +0000)
		1	2
src/cargo/util/errors.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/doc/manifest.md	patch \|	diff1 \|	diff2 \|	blob \| history